bitkeeper revision 1.1236.34.9 (4238012bpt6Tbd2QMLJnP0tgbMgzxA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 16 Mar 2005 09:49:31 +0000 (09:49 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 16 Mar 2005 09:49:31 +0000 (09:49 +0000)
commitf8499c13849b7cc815564fcf15f72a734c87107f
tree1cfebafd49307dfde5f6ef8de6731947daf682f0
parente9e375638230eee16e6e1afd284dec27ec713ca3
parentd5e030e698c55a3f358ef09fde39657ded1ead53
bitkeeper revision 1.1236.34.9 (4238012bpt6Tbd2QMLJnP0tgbMgzxA)

Merge
linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c